bitkeeper revision 1.1041.13.1 (40eb0eb2uTenw4RI9fetIsxTLmIHyQ)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 6 Jul 2004 20:42:26 +0000 (20:42 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 6 Jul 2004 20:42:26 +0000 (20:42 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno-ia64.bk

1  2 
.rootkeys

diff --cc .rootkeys
index 5c57fbab491a193e26180497921e2d9b037cbe73,35b83a496b49e16f200e6379d89a3e1529e1f627..d8edf89b738c62332349e236b29271f038456b95
+++ b/.rootkeys
  3ddb79bcSC_LvnmFlX-T5iTgaR0SKg xen/arch/x86/boot/x86_32.S
  40e42bdbNu4MjI750THP_8J1S-Sa0g xen/arch/x86/boot/x86_64.S
  3ddb79bcUrk2EIaM5VsT6wUudH1kkg xen/arch/x86/delay.c
- 3e32af9aRnYGl4GMOaDKp7JdfhOGhg xen/arch/x86/domain_page.c
- 3ddb79bcecupHj56ZbTa3B0FxDowMg xen/arch/x86/entry.S
 +40e34414WiQO4h2m3tcpaCPn7SyYyg xen/arch/x86/dom0_ops.c
+ 3ddb79bc1_2bAt67x9MFCP4AZrQnvQ xen/arch/x86/domain.c
  3ddb79bcY5zW7KhvI9gvfuPi3ZumEg xen/arch/x86/extable.c
  3fe443fdDDb0Sw6NQBCk4GQapayfTA xen/arch/x86/flushtlb.c
  3ddb79bcesE5E-lS4QhRhlqXxqj9cA xen/arch/x86/i387.c
  3ddb79bdIKgipvGoqExEQ7jawfVowA xen/arch/x86/pci-x86.h
  40a4dfced2dnSzbKgJFlD3chKHexjQ xen/arch/x86/pdb-linux.c
  4022a73czgX7d-2zfF_cb33oVemApQ xen/arch/x86/pdb-stub.c
- 3ddb79bc1_2bAt67x9MFCP4AZrQnvQ xen/arch/x86/process.c
  3ddb79bc7KxGCEJsgBnkDX7XjD_ZEQ xen/arch/x86/rwlock.c
  3ddb79bcrD6Z_rUvSDgrvjyb4846Eg xen/arch/x86/setup.c
 +405b8599xI_PoEr3zZoJ2on-jdn7iw xen/arch/x86/shadow.c
  3ddb79bcSx2e8JSR3pdSGa8x1ScYzA xen/arch/x86/smp.c
  3ddb79bcfUN3-UBCPzX26IU8bq-3aw xen/arch/x86/smpboot.c
  3ddb79bc-Udq7ol-NX4q9XsYnN7A2Q xen/arch/x86/time.c